bitkeeper revision 1.1709.1.14 (42b1ceb9Ne5WCPwhJ-uKiY4uN5-L5w)

Make MAX_VIRT_CPUS arch-dep

diff --git a/xen/include/public/arch-ia64.h b/xen/include/public/arch-ia64.h
index 53a41016414c37983ab44d36d10b88ffdcbcf47e..50b5f5f608a6b95ce9b3055b51c1be29bfc500b0 100644 (file)
--- a/xen/include/public/arch-ia64.h
+++ b/xen/include/public/arch-ia64.h
@@ -14,6 +14,10 @@
 #define _MEMORY_PADDING(_X)
 #define MEMORY_PADDING 
 
+/* Maximum number of virtual CPUs in multi-processor guests. */
+/* WARNING: before changing this, check that shared_info fits on a page */
+#define MAX_VIRT_CPUS 1
+
 #ifndef __ASSEMBLY__
 
 /* NB. Both the following are 64 bits each. */

diff --git a/xen/include/public/arch-x86_32.h b/xen/include/public/arch-x86_32.h
index 21f97669d5bbdda7459ac12c0c4dc45876d61ebb..1a11a3be86dafc0b454a6169dda450d255bc47aa 100644 (file)
--- a/xen/include/public/arch-x86_32.h
+++ b/xen/include/public/arch-x86_32.h
@@ -73,6 +73,9 @@
 #define machine_to_phys_mapping ((u32 *)HYPERVISOR_VIRT_START)
 #endif
 
+/* Maximum number of virtual CPUs in multi-processor guests. */
+#define MAX_VIRT_CPUS 32
+
 #ifndef __ASSEMBLY__
 
 /* NB. Both the following are 32 bits each. */

diff --git a/xen/include/public/arch-x86_64.h b/xen/include/public/arch-x86_64.h
index a4f4ac2fcfa91a62ce66477745ba67cffbefe9be..634c53a34e626264e317a264b5647ce8319327d4 100644 (file)
--- a/xen/include/public/arch-x86_64.h
+++ b/xen/include/public/arch-x86_64.h
@@ -73,6 +73,9 @@
 #define HYPERVISOR_VIRT_END   (0xFFFF880000000000UL)
 #endif
 
+/* Maximum number of virtual CPUs in multi-processor guests. */
+#define MAX_VIRT_CPUS 32
+
 #ifndef __ASSEMBLY__
 
 /* The machine->physical mapping table starts at this address, read-only. */

diff --git a/xen/include/public/xen.h b/xen/include/public/xen.h
index d46472c16c7d25564741b4a035acc02cc9d0d360..2fdd400e92d9c43e9e77a959a173ad02f53e5eed 100644 (file)
--- a/xen/include/public/xen.h
+++ b/xen/include/public/xen.h
@@ -287,9 +287,6 @@ typedef struct
 /* Event channel endpoints per domain. */
 #define NR_EVENT_CHANNELS 1024
 
-/* Support for multi-processor guests. */
-#define MAX_VIRT_CPUS 32
-
 /*
  * Per-VCPU information goes here. This will be cleaned up more when Xen 
  * actually supports multi-VCPU guests.